other equal stuff
nurse test changes
Merge pull request #18 from clottman/newSillyBranch

New silly branch
Merge branch 'master' into Cassey