pull
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	static/js/GLOBAL.js
	templates/pages/game_win.html
	templates/pages/intervals.html
	templates/pages/intervals_no_staff.html
	templates/pages/melodies.html
Merge
pullMerge branch 'master' of https://github.com/CaptainKanuk/eartraining
Adding for db practice.