f

f
Merge branch 'master' of https://github.com/astaeheli/cscd350-github-lab

Conflicts:
	BranchTest.java
Merge branch 'master' of https://github.com/astaeheli/cscd350-github-lab

Conflicts:
	BranchTest.java