Merge
Merge branch 'master' of https://github.com/danbuis/Armada-Module

Conflicts:
	armadaModule
Added cards, range ruler