small debuggin
fixed merge issues
fixed merge issues
fixed merge issues
Merge branch 'master' of http://github.com/allenxyz/khaos