Merge branch 'master' of https://github.com/crisstanza/jobber

Conflicts:
	.gitignore
Merge branch 'master' of github.com:crisstanza/jobber