no message
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By Morgan Chen
# Via Morgan Chen
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  added votes model