Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html

Final Submission
Merge branch 'master' of https://github.com/dannygj/dannygj.github.io