shifting things around
Merge branch 'game' of github.com:Doppelgamer/doppelengine into game