updated copy
Merge branch 'master' of github.com:MattSchroer/website

Conflicts:
	index.html