Changes contact to hide bathroom id field and present name in header
Fix merge conflicts
Merge branch 'master' into contact

* master:
  fixed hover on navbar-brand
  Revert database.yml to use bathrooms dbs
  fix buttom size for "guess" on new bathroom page"
  trying to fix active_admin
  Renamed images from bathroom to restroom
  Rename Bathroom resource Restroom.
  changed link in travis badge
  fixing gemfile lock
  update readme to have a link to env setup
  change links to imgs in signs.haml to correct asset format
  Remove blank actions in WelcomeController and test their endpoints
  Remove unused helpers.
  Remove empty BathroomsController#guess
  Use increment_counter to update votes.
  Remove extraneous comments from the routes file.
  Remove up_vote and down_vote endpoints.

Conflicts:
	app/controllers/contacts_controller.rb
	app/models/contact.rb
	app/views/bathrooms/show.html.haml
	app/views/contacts/new.html.haml
comment out env change
Merge pull request #135 from RefugeRestrooms/contact

Contact