Activity class created, other classes are empty
Merge branch 'Add-Activity'
Let's try again
Merge branch 'master' into Add-Activity
Merge branch 'Add-Activity'