css for users
fixing merge conflicts
added comments feature
added the comments feature