fixing conflicts
Merge branch 'master' of https://github.com/SaylorTw1ft/MediaBacklogApp
added new activities