styling
amiel goes to sleep
amiel merges before he goes to sleep
Merge branch 'master' of https://github.com/Akollek/WorkTogethr
Merge branch 'master' of github.com:Akollek/WorkTogethr into was-working