Desfazendo Cacas

Conflicts:
	.gitignore
	Gemfile.lock
	app/assets/javascripts/bootstrap.js
	app/assets/javascripts/statuses.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/statuses.css.scss
	app/models/status.rb
	app/models/user.rb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb
	app/views/statuses/_form.html.erb
	app/views/statuses/index.html.erb
	app/views/statuses/new.html.erb
	app/views/statuses/show.html.erb
	config/initializers/devise.rb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb