using syte
Merge branch 'gh-pages' of https://github.com/thomasdeangelis/thomasdeangelis.com into gh-pages

Conflicts:
	css/index.html
	f/index.html
	img/index.html
	index.html
	p/index.html