Committing
Merge branch 'master' of https://github.com/bconnelly/CSCI_3308_Lab4.git
Committing
Final commit
Merge branch 'master' of https://github.com/bconnelly/CSCI_3308_Lab4.git

Conflicts:
	src/hello.java