testing for android and old web
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike