merge
trying to ensure dates of places booked on trip do not overlap
merge
fixed problem in gem file
fixed conflict with gem file
code to prevent two places having the same dates
added functionlity to prevent overlap of dates being added to trip apart from travel days at start and end of a journey
Merge pull request #24 from fourmackems/master

Media Page is here!
merging the ravens and the valentines
Merge pull request #25 from raven-valentine/master

Added date overlap functionality
Merge remote-tracking branch 'ecomba/master'