comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/Config.cpp
	TowerDefense/TowerDefense.vcxproj