trying to generate a merge conflict
Merge branch 'master' of https://github.com/christineubc/Lab2Part4.git

Conflicts:
	bin/Main.class
	src/Main.java