N/A
Merge branch 'MSE-Combat' of https://github.com/ProjectTheseus/Project-Theseus-Main into MSE-Combat

Merge, fixed Min to Max
Merge branch 'MSE-Combat' of https://github.com/ProjectTheseus/Project-Theseus-Main into MSE-Combat

Conflicts:
	ProjectTheseus/src/edu/virginia/cs/sgd/libgdx/player/Player.java

Merge