project milesone 1
Merge pull request #25 from xlinda/master

project milesone 1