updated gitignore
Merge branch 'master' of https://github.com/mnipper/AndroidSurvey
robolectric tests set up
conflict merge
simple tests
more unit tests
tests
Merge branch 'master' of https://github.com/mnipper/AndroidSurvey
manifest