Building class
Merge branch 'master' of https://github.com/Domderon/spice-minions

Conflicts:
	hymn/main.lua