reset crap
Merge branch 'master' of github.com:BunsenMcDubbs/massive-octo-dangerzone

Conflicts:
	index.html