Wrote Activity Test
modified tests
Merge branch 'development' of https://github.com/ericfrommelt/retreat_app into development