removed everything. starting clean
Merge branch 'master' of https://github.com/spacewaffle/chefback

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	config/application.rb
	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
	script/rails