Merge remote-tracking branch 'origin/master' into gh-pages
recovering form git issue, had to restore files.
completed Project 2
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	Project2/index.html
	Project2/js/json.js
	Project2/js/main.js