Restructured
Merge branch 'master' of https://github.com/abirdsall/apps

Conflicts:
	zulu/zulu/game.cpp