initial checkin from combat-prototype
first line of sight render stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md