added project page
merging conflicts