Commentaire
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/AreaAttack.cpp
	TowerDefense/Attack.cpp
	TowerDefense/Attack.h
	TowerDefense/NormalAttack.cpp
	TowerDefense/NormalTower.cpp
	TowerDefense/SlowAttack.cpp
	TowerDefense/SunTower.cpp
	TowerDefense/TowerDefense.vcxproj.filters