Merge pull request #10 from b91961/master

Get project 2 branch up to date.
Merge pull request #11 from b91961/Moubarak_Jamal_Project2

Merge pull request #10 from b91961/master