Merge origin/master

Conflicts:
	BirdFlap/src/Game.java