created project 2 base files.
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	Project2/index.html
	Project2/js/json.js
	Project2/js/main.js
manually copied files from gh-pages branch to replace master. Merge was causing an error.
no significant change
Merge remote-tracking branch 'origin/gh-pages'
commiting the support files of my app that haven't changed.
Merge remote-tracking branch 'origin/master' into gh-pages