1.92
-finished coding before wave choosing and calling units system
-placeholder sprites added
Signed-off-by: alieneaters <mr.green.brean@gmail.com>
Merge branch 'master' of https://github.com/alieneaters/Prototype

Conflicts:
	game 2 prototype.gmx - Copy/Configs/Default/Android/icons/ouyaIcon.png
	game 2 prototype.gmx - Copy/Configs/Default/Tizen/icon117.png