hej allihoppa menyer
Merge branch 'sean'

Conflicts:
	silence/silence/Game.cpp
	silence/silence/Game.h