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

Conflicts:
	templates/.DS_Store
slkdfj
pushingMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

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

Conflicts:
	db.sqlite3