Merge remote-tracking branch 'origin/master'

LB-- · LB-- · commit 5b575e46949c · 2013-08-31T16:49:49.000-05:00
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+This object uses the EDIF SDK:
+https://github.com/ClickteamLLC/windows-edif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+This object uses the EDIF SDK:`
	`2`	`+https://github.com/ClickteamLLC/windows-edif`