commit
Merge branch 'master' into spencer
upvote button and greatminds working