edit to outing name 2
work on displaying activies
work on displaying activities 2
activities showing
resolving merge