merged ignore file
Merge branch 'master' of https://github.com/our-really-lame-final-project/Project