Added contents for user, errorP, conS
Merge remote-tracking branch 'origin/master'