Added more to the gitignore
Merge remote-tracking branch 'origin/master'