User saves are now stored in saves/user_saves, which is ignored by
.igignore

Fixes #119
Merge branch 'master' into ignore_saves

Conflicts:
	game/src/gameScreen.py