continuing to ignore hmtl
Merge remote-tracking branch 'github/master' into local092

Conflicts:
	computercraftFarm/.gitignore