test
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/TowerDefense.vcxproj
	TowerDefense/gtest.dll
	TowerDefense/gtest_main.dll