Buncha stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bukkit.html
	index.html