addNewComment fixed
conflict changed
heroku
added category model and router