This is my first commit
Merge branch 'master' of github.com:joehinkle11/myTest

Conflicts:
	README.md
This is my first commit