Commit contact info changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ycp-cs320-project/src/edu/ycp/CS320/jjda/ContactInfo.java