more testing
Merge branch 'master' of github.com:cromulus/The-Personal-Page

Conflicts:
	index.html.gz