Rudimentary mineral display
Merge branch 'master' of github.com:dmazin/asteroid-tycoon

Conflicts:
	index.html
merge