...
Merge branch 'master' of https://github.com/tylercamp/AI4G

Conflicts:
	AI4G Project/AI4G Project.vcxproj
	AI4G Project/Debug/vc110.idb