Merge branch 'master' into vote_features
show when someone has voted on the arrow in progress
Merge branch 'vote_features' of https://github.com/ctorstens/ScreenOverflow into vote_features
Merge branch 'development' into vote_features
added karma calculation methods to user model for user overall, post, comment karma
took out some js
Merge pull request #19 from ctorstens/vote_features

Vote features