test 2
Merge branch 'master' of git://github.com/briguychau/CPSC-310-Test

Conflicts:
	src/Hello.java