no idea what im doing
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team3

Conflicts:
	WordFinder/src/ch/unibe/scg/team3/game/Game.java