-changes in order to take in updated JSON structure, not all features have been implemented, too tired atm
-changes in order to take in updated JSON structure, not all features have been implemented, too tired atm
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/gameFrame.html
	web/test.json