tweaking .gitignore
Merge test
Merge remote-tracking branch 'origin/master'
conflict test
Merge branch 'master' of https://github.com/skid-tharfman/hellogitworld