initial commit
Merge branch 'master' of github.com:ashleygwilliams/git-in-it

Conflicts:
	README.md
basic outline