comments and posts are listed by karma
Add activity feed functonality
Merge branch 'public_activity' into development
Revert "Merge branch 'public_activity' into development"

This reverts commit 0d1ec74053d92029b984b368cf3ecdc1d674cdc8, reversing
changes made to e887f6b5de21f27bc9f3900169f5dcf25c74151e.
Merge pull request #22 from ctorstens/revert_pull_request_1

Revert "Merge branch 'public_activity' into development"
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
Fixed Tag bug
change name attribute in 'typeahead' to fix search
cleanup
Merge branch 'master' of https://github.com/ctorstens/ScreenOverflow into add_search
Dropped title column from Comments
Merge pull request #25 from ctorstens/add_search

Add search
fixed
removed title from comment in factory
Merge pull request #26 from ctorstens/comment_ajax_vote_fix

Comment ajax vote fix
Merge pull request #27 from ctorstens/development

Development