Completed the activities navigation component
Merged generator-changes
Merge pull request #21 from BYUI-Web/activities-navigation

Completed the activities navigation component
resolved conflicts