test
Merge branch 'code-refactor' of https://github.com/mwiegant/ArtilleryFire
latest changes
working JSON on user interface