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

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

Conflicts:
	.DS_Store
	db.sqlite3
Basic dajax functionality is now implemented.
Merge branch 'master' of https://github.com/CaptainKanuk/eartraining
Merging new stuff with dajax functionality
Conflicts:
	.DS_Store
	db.sqlite3
	eartraining/urls.py
	pages/views.py
	templates/base.html
	templates/pages/hub.html