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

Conflicts:
	db.sqlite3