Thanks SublimeText for your cache...
Merge branch 'master' of github.com:FranzPoize/5colordeathrow

Conflicts:
	index.html