Some half-assed changes
Merge branch 'master' of https://github.com/KeatonTech/Chromosapiens-Note-App

Conflicts:
	templates/elements/bunny-editor.js