Merge pull request #2 from AaronLlanos/master

Part 1.3 Done
Merge pull request #3 from AaronLlanos/allanos

Merge pull request #2 from AaronLlanos/master
Aaron's Input
Thursday Update
Merge branch 'master' of https://github.com/AaronLlanos/-CS439-Project-0
Merge http://github.com/AaronLlanos/-CS439-Project-0
Tarik