nav-pinga
changed tagline
Merge branch 'drkyro' of github.com:lincolnhack/lincolnhack into alain
one click to submit
updated gitignore
Merge branch 'drkyro' of github.com:lincolnhack/lincolnhack into alain
wtf
start mixing this up
ASERE
rt
added contents model
df
fixed conflicts
fixed topics
dfdf
d
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