Merge branch 'master' of https://github.com/GeorgiBoykov/TEAM-COCONUT

Conflicts:
	Game/images/beer.png