move coffee
move coffee
add git ignore
Merge branch 'php'

Conflicts:
	.gitignore
Merge branch 'coffee'