--amend
friendly-forwarding after log in
show comments of the link
comments part finish
quick error fix
add Vote model
Merge branch 'master' of heroku.com:reddit-on-rails

Conflicts:
	app/controllers/links_controller.rb
	app/views/links/index.html.erb
make voting function work
decorate style
Merge branch 'voting'