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
Added johns design to the mobile version settings
Twitched and Improved the view booking page
Merge pull request #17 from pkawalec/master

bug fixed + no more shuffle + min width for trainers' table
Merge pull request #1 from RobertJGabriel/master

pull from rob to me (for updating)