Initial project setup
Set up initial site for project
Setting up remote repository
fixing merge conflicts