Combat System and Website Updates

Combat System now using game rather than single-view.
Web updates for json