Added current user email to comment
modified gitignore to ignore local /public/uploads folder
Added comments controller spec file with pseudocode
fixed conflict