Merge branch 'gh-pages'
Project 3
Finished Project 3
Merge branch 'master' into gh-pages

Conflicts:
	Project_3/.idea/workspace.xml
	Project_3/css/main.css
	Project_3/index.html