TOOMANYCOMMITS
mas commits
Merge branch 'master' of https://github.com/milesreyes/milesreyes.github.io

Conflicts:
	Pentathalon.html
	index.html