Almost done
Almost done
Almost done
Almost done
Merge branch 'master' of https://github.com/Crash-ID/bogomil_kolarov_tues

Conflicts:
	OS/file.c