Employee altered
Merge branch 'jinoSandbox' of https://github.com/zackschrag/cs481-FantasticFour into jinoSandbox