finish activities
Merge pull request #37 from Jerrysilva95/master

finish activities