merge
Merge pull request #5 from epoiate/Activites

merge