Week 7 updates
Merge branch 'master' of https://github.com/tjhernandez34/tjhernandez34.github.io

Conflicts:
	index.html
	week6_technical.html