Merge pull request #7 from ZooTypers/master

pull
tried to fix loading screen. breaks when you actually start a game, but
works for error states
Merge pull request #142 from littlpunk/master

push