Indicators, ui separation
Merge branch 'master' of github.com:Carolinitzny/BaconGameJam07

Conflicts:
	entity.lua