getChallenges fixed
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

Conflicts:
	QuizWalk/src/se/chalmers/it12/tda367/vt13/grp11/quizwalk/model/QuizWalkGame.java