initial commit
Merge branch 'master' of github.com:PetersonDave/training

Conflicts:
	.gitignore
Merge branch 'master' of github.com:PetersonDave/training