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

Conflicts:
	templates/pages/index.html