added to .gitignore
Merge branch 'master' of https://github.com/jdeloach/CIS520Pintos