starting messages
Merge branch 'team3Master' into feature-activity
added gui and stuff
activity log works yay
fixed test for travis again
Merge pull request #22 from JustDuckItAll/feature-activity

starting messages
hotfixed wordwrapping in description
fixed merge conflicts