combined
Merge branch 'master' of https://github.com/wadse11/nore

Conflicts:
	main.js