Getting ready to work on votes
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:
  fixed regex bug
Ready for merge, votes unfinished
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By lokada
# Via lokada
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  swtiching from individual up and down vote partials to _vote.html.erb
  working on vote partials

Conflicts:
	app/controllers/votes_controller.rb
Vote objects almost done
Merge branches 'master' and 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By Morgan Chen (1) and lokada (1)
# Via lokada (2) and Morgan Chen (1)
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  vote buttons are being displayed with filled in params
  added uniqueness validation to vote

# By Morgan Chen (1) and lokada (1)
# Via lokada (2) and Morgan Chen (1)
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  vote buttons are being displayed with filled in params
  added uniqueness validation to vote

Conflicts:
	app/controllers/votes_controller.rb
	app/models/vote.rb