adding new homepage and project pages
fixing merge conflicts between project pages