Merging code
Merge branch 'master' of https://github.com/joePasz/bar-website
Merge pull request #7 from joePasz/master

server update