Testing 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ca/ualberta/cmput291TeamNYC/project1/Main.java