some changes
Merge branch 'master' of github.com:sfishman827/comp-site

Conflicts:
	.DS_Store
	homepage.css
	tech.html
mostly updating template.py
Merge branch 'master' of github.com:sfishman827/comp-site

Conflicts:
	homepage.css
	template.py
updated templating and styling