gettin
gettingMerge branch 'master' of https://github.com/CaptainKanuk/eartraining
getting
LAST DAY B4 DEMOMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

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

Conflicts:
	db.sqlite3
	static/js/ajax-functions.js
it worksssssMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
	static/js/hub.js