Merging code
Merge branch 'master' of https://github.com/joePasz/bar-website