Merge remote-tracking branch 'SirSlaxalot/master'

Conflicts:
	examples.html