new platforms
Merge branch 'develop' of https://github.com/haroniti/NinjaCoders125 into develop

Conflicts:
	CollossalBossGame/server/game.cpp
testing
stash
stuffs