adding gitignore, hopefully its not too late
Merge remote-tracking branch 'origin/master'