Testing branches
Updated branches
Merge remote-tracking branch 'origin/Brandon' into Richard

Conflicts:
	src/Test.java
updated class
updates
Merge remote-tracking branch 'origin/master' into dev
updated system.out.println