Committing before pull
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining
Made hub nice and shiny
Conflicts:
	db.sqlite3
	templates/base.html
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	database/ajax.py
	db.sqlite3
Merged all the hub stuff. THIS IS THE MOST RECENT WORKING CODE.

EVERYTHING WORKS!

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

Conflicts:
	db.sqlite3