Vendor compiled assets
User signup complete
User signup complete
Done with sign in
Done with sign in
Merge branch 'sign-in-out'

Conflicts:
Done with sign in
Merge branch 'sign-in-out'

Conflicts:
	app/controllers/.users_controller.rb.swn~HEAD
Merge branch 'signing-up'

Conflicts:
	app/controllers/.users_controller.rb.swn
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/users/.new.html.erb.swp
	config/.routes.rb.swp
	spec/controllers/users_controller_spec.rb
	spec/requests/layout_links_spec.rb
	spec/requests/users_spec.rb
	vendor/assets/stylesheets/.custom.css.swp
Done with user edit/update, index, and destroy actions
Added user microposts
Done with user edit/update, index, and destroy actions
Merge branch 'user-microposts'

Conflicts:
	app/controllers/.pages_controller.rb.swp
	app/controllers/.sessions_controller.rb.swp
	app/controllers/.users_controller.rb.swn
	app/controllers/users_controller.rb
	app/helpers/.sessions_helper.rb.swo
	app/helpers/sessions_helper.rb
	app/models/.micropost.rb.swp
	app/models/.user.rb.swp
	app/models/user.rb
	app/views/layouts/._header.html.erb.swp
	app/views/microposts/._micropost.html.erb.swp
	app/views/pages/.home.html.erb.swp
	app/views/sessions/.new.html.erb.swp
	app/views/shared/._error_messages.html.erb.swp
	app/views/shared/_user_info.html.erb
	app/views/users/.edit.html.erb.swp
	app/views/users/.new.html.erb.swp
	app/views/users/index.html.erb
	config/.database.yml.swp
	config/.routes.rb.swp
	db/schema.rb
	lib/tasks/sample_data.rake
	spec/controllers/.microposts_controller_spec.rb.swp
	spec/factories.rb
	spec/models/user_spec.rb
	vendor/assets/stylesheets/custom.css