gotta pull some shit
trying againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store
	db.sqlite3
	templates/pages/hub.html
need updatezzzzz
getting stuff Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

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

Conflicts:
	database/ajax.py
	db.sqlite3
	templates/base.html
	templates/pages/hub.html
and againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	templates/base.html