second commit
Merge branch 'master' of https://github.com/salazaraj2/cmsc255

update .gitignore