Changed page and template on github
Merge branch 'master' of https://github.com/mwfrost/mwfrost.github.com

Conflicts:
	index.html