gemfile and schema
users; login using authlogic

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/home_controller.rb
	app/views/home/index.html.haml
	app/views/layouts/application.html.haml
	config/routes.rb
	db/schema.rb