blah
Merge branch 'master' of https://github.com/uitgeholzerd/ds-practicum
changed login protocol
mergefix