Mergeprep
Merge branch 'master' of github.com:markcharyk/Haikute

Conflicts:
	static/haikute_page.js
Merge branch 'sql' of github.com:markcharyk/Haikute into sql
Pushed DB integration through