Merge branch 'origin/gh-pages'
Switched JSON functions
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'

Conflicts:
	Week_1A/js/main.js
Merge branch 'origin/gh-pages'
Merge branch 'origin/master'
Reverting json.