modified routes.rb
edited stylesheets
Added google details to db
fixed merge issues