Added bottom of servermaster
Merge branch 'master' of https://github.com/tfs-cs485-team-awesome/tfs