Merge branches 'SR1', 'SR2' and 'master' of github.com:JGM05/Node into SR2
mods to master
mods to SR2 rom master
mods to SR2
deleted .idea
deleted the remains from .idea
deleted .idea
amended
removed old code
demonstrated revert mechanism
Merge remote-tracking branch 'RepoNode/SR1' into SR1

Conflicts:
	Server.js