First xunix commit
Merge branch 'master' of https://github.com/xesroche/xunix

Conflicts:
	.gitignore