small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/Field.cpp
	TowerDefense/Field.h
Merge branch 'master' of https://github.com/eorielle/TowerDefense