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

Conflicts:
	db.sqlite3
	templates/pages/hub.html
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining
Committing for merge
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
	static/js/ajax-functions.js
	templates/pages/hub.html
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
Committing for push.
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3