half way through the bookings page
Merge branch 'master' into kacob
completed sending booking email to tourist upon booking, yet to be tested though
Merge branch 'master' of github.com:nanakay/gcdcApp
type casted order id to string to resolve error
resolved conflict in order confirmation file