Added test 3.
Added test 4.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/edu/beta/Main.java