i want thingz
waaaaaaaantMerge branch 'master' of https://github.com/CaptainKanuk/eartraining
plz fix it
plzzzzzzzzzMPerge branch 'master' of https://github.com/CaptainKanuk/eartraining
yaaaaaaay databasez
again Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
	static/js/progress-bar.js
	templates/pages/intervals.html