Cursorsgit add -A
Merge branch 'master' of github.com:mauricelam/collab