# This is a combination of 2 commits.
# The first commit's message is:

resolved merge conflict.

# This is the 2nd commit message:

Added the upstream
Resolved conflict in Gemlock.
Added acts_as_votable gem to the gemfile.