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

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
	static/js/progress-bar.js
Trying to get placement correct.