this is the latest version by Fri afternoon
latest version
Merge branch 'master' of
https://github.com/slc-cs-summer-research/Combined_JSON_Program_Viewer

Conflicts:
	res/values/strings.xml