Renamed baseMan to baseManActor
Merge branch 'master' of github.com:rodnover55/ludum_dare

Conflicts:
	main.js