Create .gitignore (Lucy)
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S4_Team6
Resolving conflict with master