Initial commit
Push
First Commit
Merge origin/master
Sam1 Commit
New Commit
Merge origin/master

Conflicts:
	README.md