Merge branch 'master' of https://github.com/VilenEera/remote-working into VilenEera-master

Conflicts:
	README.md
Merge branch 'VilenEera-master'
Merge branch 'master' of https://github.com/greatghoul/remote-working

Conflicts:
	README.md