Merge branch 'master' of https://github.com/tony-kerz/gut-hub-api

Conflicts:
	.gitignore