Test Case
Merge branch 'master' of https://github.com/dbhaug/assignments.git

Conflicts:
	CS325/.classpath
	CS325/bin/assignments/frs/chap2/TestEmail.class
	CS325/src/assignments/Second.java
	CS325/src/assignments/frs/chap2/TestEmail.java