Adding a second black box character and collision detection between the chars
Merge branch 'master' of github.com:rustedgrail/Tacticalle

Conflicts:
	Procfile