added a file
Merge branch 'master' of http://github.com/isabel12/NWEN304_Project1

merged local copy with github .gitignore files