* added temp files to ignore
Merge branch 'master' of https://github.com/jheddings/git.conf