fixed about
trying againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store