Initial code commit
Merge branch 'master' of github.com:cdeange/coffee-run

Conflicts:
	.gitignore