Merge branch 'master' into unitTest
Merge branches 'master' and 'unitTest' of https://github.com/Sajfer/EDA397-Group6 into unitTest
GitFunctionality-JunitTest Added
Merge branch 'unitTest' of https://github.com/Sajfer/EDA397-Group6
Integrated with test branch. Before adding tests, look up how android InstrumentationTestCase works. We should create a "testing" account on github, invite it to our repo than have all tests use that account's username/password (so we can actually test the code).