tidying up
merge
merge
wrote and passed test for adding activity index page