project2 and project3
Merge pull request #154 from lanheng92/master

project2 and project3