more checks on action
Deleted Sample Action
Bugs from Action
Actions Changed
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller

Conflicts:
	src/Models/JavaPlayer.java