added in max and min stuff
Merge branch 'master' of https://github.com/tbarker23/gitSandBox.git

Conflicts:
	myGitSandbox/src/myGitSandbox/MyGitSandbox.java
	
	me and bryan got this working together