Added Level 12

Added level 12 to levels.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/data/levels.js
Merge remote-tracking branch 'origin/master'