Merge pull request #1 from csmpls/master

my changes
excluded some files from gitignore
some comments on the draft
Merge pull request #1 from wazaahhh/master

integrating thomas notes