Merge pull request #15 from jrpruit1/master

Improved UI for booking system
Second Deliverable
Merge conflict adjustments