Added johns bar and table to mobile website
Merge branch 'master' of https://github.com/RobertJGabriel/Third-Year-Group-Project

Conflicts:
assests/css/normal/style.css
gv