Almost final version. error with question stage on xo. it crashes
Merge branch 'master' of https://github.com/shafycz/TeamSomething.git

Conflicts:
	BasketballNewest/basketball.activity/game/1.png
	BasketballNewest/basketball.activity/game/2.png
	BasketballNewest/basketball.activity/game/3.png
	BasketballNewest/basketball.activity/game/background.png
	BasketballNewest/basketball.activity/game/background1.png
	BasketballNewest/basketball.activity/game/background2.png
	BasketballNewest/basketball.activity/game/background5.png
	BasketballNewest/basketball.activity/game/basket3.png
	BasketballNewest/basketball.activity/game/basketball.py
	BasketballNewest/basketball.activity/game/basketball2.py
	BasketballNewest/basketball.activity/game/check.png
	BasketballNewest/basketball.activity/game/colors/blackb1.png
	BasketballNewest/basketball.activity/game/colors/blackb2.png
	BasketballNewest/basketball.activity/game/colors/blackb3.png
	BasketballNewest/basketball.activity/game/colors/blueb1.png
	BasketballNewest/basketball.activity/game/colors/blueb2.png
	BasketballNewest/basketball.activity/game/colors/blueb3.png
	BasketballNewest/basketball.activity/game/colors/greenb1.png
	BasketballNewest/basketball.activity/game/colors/greenb2.png
	BasketballNewest/basketball.activity/game/colors/greenb3.png
	BasketballNewest/basketball.activity/game/colors/pinkb1.png
	BasketballNewest/basketball.activity/game/colors/pinkb2.png
	BasketballNewest/basketball.activity/game/colors/pinkb3.png
	BasketballNewest/basketball.activity/game/colors/purpleb1.png
	BasketballNewest/basketball.activity/game/colors/purpleb2.png
	BasketballNewest/basketball.activity/game/colors/purpleb3.png
	BasketballNewest/basketball.activity/game/colors/redb1.png
	BasketballNewest/basketball.activity/game/colors/redb2.png
	BasketballNewest/basketball.activity/game/colors/redb3.png
	BasketballNewest/basketball.activity/game/colors/subjectB.png
	BasketballNewest/basketball.activity/game/colors/thereB.png
	BasketballNewest/basketball.activity/game/colors/toB.png
	BasketballNewest/basketball.activity/game/counter.py
	BasketballNewest/basketball.activity/game/game.py
	BasketballNewest/basketball.activity/game/mainMenu.py
	BasketballNewest/basketball.activity/game/newbasket.png
	BasketballNewest/basketball.activity/game/question.py
	BasketballNewest/basketball.activity/game/test.py
	BasketballNewest/basketball.activity/game/x.png