Merge pull request #33 from pannellr/master

Updating Aboodie's branch
Merge pull request #42 from pannellr/gattous

Merge pull request #33 from pannellr/master
Merge branch 'master' of https://github.com/pannellr/3132GroupProject into vivian2
add