Merge pull request #2 from eduardopoleo/somehifimockups

Somehifimockups
Tied layout links
Added ads creation, links and other layout changes
test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/controllers/users_controller.rb
	config/routes.rb
Added User show page, updated ad show page, added extra navagation link