Merge pull request #12 from mikegiberson/master

Merge pull request #40 from syhc/master
Fix Logout

and the employee unit test
Merge pull request #41 from syhc/master

Fix Logout
Merge pull request #4 from mikegiberson/master

Merge