mo
Merge branch 'master' of https://github.com/jackhinman/GitTest1
fixed merge conflict

Conflicts:
	README.md