Commit before merge.
Merge branch 'master' of github.com:krotovic/codie

Conflicts:
	app/Codie.js
	app/Editor.js
	index.html
	main.js
	package.json