Merge pull request #3 from ugastro-decals/master

Updated
Finished FinalProject
Merge pull request #74 from quanhuynh/master

Finished FinalProject