updated to actually build the x86 by default
Merge branch 'master' of https://github.com/ztane/zsos
fixed makefile