local premerge commit
fixed stuff (still pre-merge commit)
Merge branch 'master' of github.com:reinei/Adventure

Conflicts:
	Adventure/GameLoop.cs
more refactoring
Merge branch 'master' of github.com:reinei/Adventure

Conflicts:
	Adventure/Rendering/Screen.cs