Added log
+
Merge remote-tracking branch 'upstream/master'
upstream changes
Merge pull request #21 from Spetz1/master

Added log
Removed unnecessary print stacks
New user now sends a 'User' object
New time slot now works
Updates and 'resets'
Hotfix
Fixed merge conflic
Merge remote-tracking branch 'upstream/master'