Finish layout and routes
Added avatar
Finish user signup
Merge branch 'sign-up'

Conflicts:
	Gemfile
	Gemfile.lock
	Gemfile~
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/custom.css.scss~
	app/controllers/users_controller.rb
	app/controllers/users_controller.rb~
	app/helpers/users_helper.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_footer.html.erb~
	app/views/layouts/_header.html.erb~
	app/views/layouts/application.html.erb
	app/views/layouts/application.html.erb~
	app/views/static_pages/home.html.erb~
	app/views/users/new.html.erb
	app/views/users/new.html.erb~
	config/application.rb
	config/application.rb~
	config/routes.rb
	config/routes.rb~
	db/schema.rb
	spec/requests/user_pages_spec.rb
	spec/requests/user_pages_spec.rb~