comments and posts are listed by karma
merge conflict in post show and post model
merge conflicts post show and post model
Merge branch 'development' into vote_features

Conflicts:
	app/models/post.rb
	app/views/posts/show.html.haml
Merge pull request #24 from ctorstens/vote_features

Vote features