first commit
Merge http://github.com/gigavinyl/coffeeshop

Conflicts:
	index.html