Updates
Updates again
Merge branch 'master' of https://github.com/SirDestrox/Computergebruik

Conflicts:
	badScript.sh
Fix the pruts