getting someeeeeeee
last pull?Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
nope, pulling againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

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

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

Conflicts:
	.DS_Store
	db.sqlite3
cleaned up except for static filesMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3