Commented out some old code, modified param in handleAnswer
Merge branch 'challenge' of https://github.com/Hasselmannen/sleepfighter into challenge
Merge branch 'challenge' into development

Conflicts:
	application/src/se/chalmers/dat255/sleepfighter/activities/SimpleMathActivity.java
Merge branch 'development' of https://github.com/Hasselmannen/sleepfighter into development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.