Add photo and title to users
Merge branch 'user-adds'
Fix merge issues
Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/stylesheets/custom.css.sass
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	config.ru
	config/application.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb