- calulcate activity
Merge pull request #4 from andrivincenz/dev_sandro

- calulcate activity
Merge pull request #3 from Appquest/master

calulator