Massacre Mission Done
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/source/Game States/GameplayState.cpp
	WarInParadise/source/Game States/GameplayState.h