folders still dont work!
pre merge commit
Merge branch 'master' into fs

Conflicts:
	MatrixOS.iso
	tar.tar
added useful alias: clean
cleaned with astyle
finished