strike
Merge branch 'master' of github.com:mturley/mortycraft-www

Conflicts:
	index.html