Fix undefined displaying
Refresh on button push
Mergeprep
Merge branch 'master' of github.com:markcharyk/Haikute

Conflicts:
	static/haikute_page.js
Add sqlite read and write
Merge branch 'sql' of github.com:markcharyk/Haikute into sql
Queue Refactor, Animation Failure
Pushed DB integration through
deployable database
Merge branch 'master' of github.com:markcharyk/Haikute

Conflicts:
	static/haikute_page.js
Replace static folder
GIT HELL
Add CSS and fix Git Hell
Wow Much Design
Learning to merge
CSS bug fix
website redesign
pruning file structure
add error page
Better CSS + jQuery