Working out the model architecture
Working out species and storage.
Merge branch 'master' into model-arch

Conflicts:
	lib/js/main.js