Completed Feature 3 and 4: duffytj and schneimd
Merging
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike