stuff
io
Merge branch 'thedigit' into drkyro

Conflicts:
	app/assets/stylesheets/style.css
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
more ui stuff
Merge branch 'drkyro' into something

Conflicts:
	app/assets/stylesheets/style.css
	app/views/home/index.html.erb
Merge branch 'something' into thedigit
xc
Merge branch 'drkyro' of https://github.com/lincolnhack/lincolnhack into drkyro
Merge branch 'thedigit' into drkyro
lol