init commit
Merge branch 'master' of github.com:sharocko/dustin-goodman

Conflicts:
	.gitignore