project final draft
Merge pull request #80 from xlinda/master

project final draft