Modified
Merge branch 'Navin'

Conflicts:
	src/BranchClass.java