Omg conflict.
Merge branch 'master' of https://github.com/HainLukas/kiv.os.git
Omg conflict...shell upgrade...not working at all