initial upload

Pre-Alpha stages
Merge branch 'master' of https://github.com/novacrazy/jhj

Conflicts: