aeroplane
Merge branch 'master' of https://github.com/TeamZilla/Destroyer

Conflicts:
	vs2013/Destroyer/source/EnemyFactory.cpp