learn to merge locally
Merge branch 'master' of https://github.com/JameTung/Coworker into JameTung-master