TEMPLATING ACHIEVED
templatingMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store
	static/.DS_Store
	templates/pages/index.html