Merge branch 'alain' into drkyro

Conflicts:
	config/database.yml
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
login buttons
typeahead nw works   hooohoooo
ok ok
e
typeahead
fix this shit
a LOT of work on the homepage
merged and fixed conflicts