hopefully the last time i commit this file, added gitignore
Merge branch 'master' of github.com:tonyalbor/project2