rakiya
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/GeorgiBoykov/TEAM-COCONUT

Conflicts:
	Game/images/beer.png
Merge branch 'master' of https://github.com/GeorgiBoykov/TEAM-COCONUT