added new units
Merge branch 'master' of https://github.com/ben2117/V0

Conflicts:
	cardCommands.js