Snapshot of progress
Add data schema for new drinks
Remove weird log file
Merge branch 'server'

Conflicts:
	app/css/style.css.map
	dist/css/style.css.map