App setup w/ coffee
test dir
Merge branch 'antonios'

Conflicts:
	package.json