resolved things
stupid Brain derped itMerge branch 'master' of https://github.com/winniethepoohbear/Lab6CodeReview

Conflicts:
	src/banking/primitive/core/ServerSolution.java