added prop to gitignore
updated log for 18th march
made the client connection not shutdown
Fixed merge conflict in cc