Initial commit
Merge branch 'master' of github.com:ericjt/repos1
Initial commit
Merge branch 'master' of github.com:NeoJT/rep1

Conflicts:
	README.md