Merge pull request #23 from clottman/newSillyBranch

New silly branch
michael's unit tests
Merge branch 'master' into newSillyBranch
michael's unit tests but better