2 canvas elemente
Merge branch 'master' of https://github.com/SteffiB/BMMP

Conflicts:
	Code/js/main.js