initial commit
Merge branch 'master' of github.com:KevinTraver/learngitflow

Conflicts:
	README.md

added .gitignore