Vitun perse
Merge branch 'master' of github.com:Juzmach/hackathon-hk

Conflicts:
	HomokaasuTheGame/src/com/example/homokaasuthegame/MainActivity.java