Finish the skeleton
Merge branch 'master' of https://github.com/rivesurgen/jsmake
Finish the skeleton