Finished Unit Tests
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike.git
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike.git
Merging tests into master