parallel changes
Merge branch 'master' of github.com:kallivis/Kallinux