first commit
Merge branch 'master' of github.com:deegill/thirtysixweeks

Conflicts:
	README.md