New
Merge https://github.com/Magmoz/CoffeeGo
Merge https://github.com/magmoz/coffeego

Conflicts:
	.DS_Store