Rick Test commit (Text added)
antwoord
Merge remote-tracking branch 'origin/master' into RoyVakantie

Conflicts:
	src/nl/saxion/act/playground/MyGameActivity.java