test
Merge branch 'master' of
https://github.com/KevinMartin7/CSCI3308Lab4.git

Conflicts:
	src/helloworld/hello.java
Merge branch 'master' of https://github.com/KevinMartin7/CSCI3308Lab4.git
Merge branch 'master' of https://github.com/KevinMartin7/CSCI3308Lab4.git
test