initial commit
Merge https://github.com/Jabo5536/Japp