changed some things I can't remember
Merge branch 'master' of https://github.com/tobiasvdp/industrialProcessing