Simulating changes from another computer
Merge branch 'master' of https://github.com/alexrigas/CM1101