call to action button
merge develop
renamed file to logo
add logo
delete file
Merge branch 'twitter-bootstrap' into develop

Conflicts:
	app/views/map/show.html.erb