trytry
try11
Merge branch 'master' of https://github.com/DorisLee/WEat

Conflicts:
	WEat/nbproject/build-impl.xml
	WEat/nbproject/genfiles.properties
	WEat/nbproject/project.properties
	WEat/nbproject/project.xml
	WEat/src/java/edu/pitt/domain/User.java
	WEat/src/java/edu/pitt/utilities/DbUtilities.java
66
77
Merge branch 'master' of https://github.com/DorisLee/WEat

Conflicts:
	WEat/nbproject/build-impl.xml
	WEat/nbproject/genfiles.properties
	WEat/nbproject/project.properties
	WEat/nbproject/project.xml
	WEat/src/java/edu/pitt/domain/User.java
	WEat/src/java/edu/pitt/utilities/DbUtilities.java