fixed fackin conflicts
more progress on the homepage
Merge branch 'alain' of github.com:lincolnhack/lincolnhack into drkyro

Conflicts:
	app/views/home/index.html.erb
	config/database.yml
	config/routes.rb
	db/schema.rb