Gitignire
Merge branch 'master' of github.com:JGrubb/hobo-companion

Conflicts:
	.gitignore