Preparing to manually merge everything
Preparing to merge
Merge branch 'master' of https://github.com/PocketEngi/shutengu

Conflicts:
	SDLeugene/Eugene's part of the game.cpp
	SDLeugene/background.png