Merge origin/master into myBranch

Conflicts:
	src/main/java/edu/mum/cs545/dao/BankingManager.java