making cool stuff
Merge branch 'master' of https://github.com/Jon1213/activity_app