CHanged all the tests from junit tests to android junit tests
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git