commiting before merging with vince
Merge remote-tracking branch 'vince/mynewbranch'

Conflicts:
	log/test.log
commiting before merging with vince
merging with vince's new code
Merge remote-tracking branch 'vince/fixing_css'
commiting tidy javascript
commiting tidy javascript
Merge pull request #3 from triathlonboy/master

3. A user can view places on a map after creating places associated with a trip
commit before merge from ecomba
commit before pushing to remote
Merge pull request #4 from triathlonboy/master

Friday Pull Request to allow others to fetch over the weekend if needed
commit before merging with frontend additions
commiting before merge
Updating Maps Show page
Updating Maps Show Page
Some more updates
Got it sorted
Trying to tidy up the JavaScript
Routed to maps page on local3000 load
updating the CSS for the homepage
commiting before merging with ecomba