moved stuff and deleted stuff
Merge branch 'master' of github.com:failedxyz/jsos