Changed one thing in componente
Merge branch 'master' of https://github.com/anthonyappcard/multiverseminer

Conflicts:
	assets/data/components.xls
Pushing again...
Merge branch 'master' of https://github.com/anthonyappcard/multiverseminer