Added canvas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/crocodroid/skaalsveen/olsen/no/crocodroid/GameActivity.java