trying to add my activity
fixing conflicts
Merge pull request #20 from dewguzzler/master

added my activity