can create a place
draft
adding a trip, viewing trips
Updated some CSS and added date_select to place new page
Updated the CSS
Places and Trips all work but  withOUT validation
Pre merge commit
Merge remote-tracking branch 'Vince/fixing_css' into merge_map

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/CE5/650/sprockets%2F8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/D91/080/sprockets%2Fbcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/D9F/300/sprockets%2Fc13fc73ceafa45876a901b3e775b83ae
tidied up the layouts html erb files
Integration with maps
updated routes.rb
merged with matt
some updateds
Added a Trips title to the map
Conflicts
resolved conflicts
Updated the migrates
Merge pull request #3 from triathlonboy/master

3. A user can view places on a map after creating places associated with a trip
Added a sidebar nav
Vince and I added the add another place to the map page included show hid jQuery