project page complete
Merge branch 'master' into long_projectPage
Merge pull request #26 from christiansakai/long_projectPage

Long project page