Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	CS425App.v11.suo
	Debug/Agent.obj
	Debug/CS425App.exe
	Debug/CS425App.ilk
	Debug/CS425App.log
	Debug/CS425App.pdb
	Debug/GameApplication.obj
	Debug/Tower.obj
	Debug/link.read.1.tlog
	Debug/vc110.idb
	Debug/vc110.pdb
	Grid.txt