getting stuff
gettin more stuffMerge branch 'master' of https://github.com/CaptainKanuk/eartraining
more templating
getting stuffMerge branch 'master' of https://github.com/CaptainKanuk/eartraining