Third push
Fixed
Merge branch 'master' of https://github.com/sivash/git-exercise

Conflicts:
	src/edu/grinnell/csc207/sivarama/hello/HelloWorld.java