added mac shit to git ignore
Merge branch 'master' of https://github.com/TeamFauna/testing
Merge branch 'master' of https://github.com/TeamFauna/testing
adding part 2
Merge branch 'master' of https://github.com/TeamFauna/testing