Implemented US20 - Male/Female listed as Wife/Husband respectively, not necessarily same sex marriage.
Merge branch 'master' of https://github.com/bigbeta1914/SSW555WS_2014_Team5

Conflicts:
	src/java/MainProgram.java
Updated Java version in properties (again).  Merged changes.