Added everything
merge conflicts
added an goal
merged master into project