Booking routes and view html file created
Typeface added hosted by Google fonts - Grand Hotel for logo, Lato as general typeface. Initial style added to logo
move discounts calculation to restaurant.rb from home_controller, display discounts on homepage
Style and hard-coded HTML for the booking view
Continued Booking form style
Facebook glyphicon added to Booking form style
ReadMe formatted correctly
trying to resolve conflicts
Resolved confilcts and added modal to Index.html
Merge pull request #12 from taliascotchbrook/taliabranch

conflicts resolved: booking form about 85% styled and hardcoded