Modified .gitignore
Modified .gitignore to not include project files
Merge remote-tracking branch 'origin/master'