Merge conflicts being fixed
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By Morgan Chen (1) and lokada (1)
# Via lokada
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  working on deleting posts
  added score and redditpost_id to comments

Conflicts:
	db/schema.rb