Weird readme commit problem

no biggie
Merge branch 'master' of https://github.com/evandam/JS-OS

Conflicts:
	README.md