Just some housekeeping
Merge branch 'master' of https://github.com/JonasWecshler/Chat