completely update
Merge branch 'master' of github.com:thogg4/classie

Conflicts:
	.gitignore
	Rakefile
	app/controllers/admin_controller.rb
	app/controllers/ads_controller.rb
	app/controllers/application_controller.rb
	app/controllers/cats_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/sub_cats_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/models/ad.rb
	app/models/asset.rb
	app/models/cat.rb
	app/models/user.rb
	config/boot.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/session_store.rb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	public/404.html
	public/422.html
	public/500.html
	test/fixtures/ads.yml
	test/fixtures/cats.yml
	test/fixtures/users.yml