css tweaks
fixed caption width
Merge pull request #50 from th7/heroku-master

Heroku master
Merge pull request #49 from th7/style_tweaks

Style tweaks
New relevant readme
Merge remote-tracking branch 'origin/master' into only-own-trips

Kept changes, removed unused section, updated beta message

Conflicts:
	app/views/main/index.html.erb