Git merge exercise should use a separate repository

[NateWr]

The git merge exercise in week 2 led to a bit of chaos, because several students had committed to branches from the exercise in week 1. As a result, it created merge conflicts and there were lots of extra commits when trying to follow the merge exercise.

To keep it simple, we should have a separate repo that they clone, branch and merge with just for this exercise.