Working on trainer home
Merge branch 'master' of https://github.com/dvaughn/easyTrainer

Conflicts:
	.DS_Store