Added JSON.js file, Updated main.js file
Got JSON and XML data to function but only when using Safari
Combining master and GH pages branches

Conflicts:
	.DS_Store