update comments
change to the gitignore file
Merge remote-tracking branch 'refs/remotes/origin/master'