Finished final project
Merge pull request #76 from dspadoni/master

Finished final project