Add Coffee
Merge branch 'master' of github.com:Papillard/git-github-workflow

Conflicts:
	index.html