Changes

5. git checkout mouselock, change to mouse lock to merge with our up to date master. <br />

6. git merge master <br />

To fix a merge conflict <br />

1. git status, to see what files have an issue <br />

2. git add <file>, fix then add those files <br />

3. git commit