getting stuff
mergingMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

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

Conflicts:
	db.sqlite3