pushing today
trying againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	database/ajax.py
	db.sqlite3
	static/js/GLOBAL.js
	static/js/ajax-functions.js
	static/js/melodies.js
	static/js/music-staff.js
	static/js/progress-bar.js
	templates/pages/intervals.html