Merge branch 'master' of https://github.com/jgreaser/Reinvention-Take-A-Stand

Conflicts:
	index.html
Resolved conflicts with listy thing