fixed data
merge conflicts
Updates to projects list page. Changed route system to project page