Changed any occurrences of "User" to "Employee".
Merge branch 'master' of https://github.com/paulmoon/seng422