Cleaner code
Merge branch 'master' of https://github.com/mailmindlin/teach-oop

Conflicts:
	dragdrop.js
	emulator.js
	main.html
	naming.js