Fix seed generation
Merge branch 'master' of https://github.com/fredley/incraftmental
New seed button
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/world.js