Small stylistic changes
Conflict fix
Pre-pull commit
Drinks menu done
Merge branch 'master' of https://github.com/jeshuamaxey/goodnight