Fixes issue #45
Merge branch 'master' of https://github.com/dejesus2010/CEN3031Project
Merge branch 'ryan'