??
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://Roysten@github.com/Roysten/Picto.git
test commit
Aanpassing gedaan
Merge branch 'master' of https://Roysten@github.com/Roysten/Picto.git

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