test again
test again again
Merge branch 'master' of https://github.com/FreshTeam/NewSpring.git

Conflicts:
	GoDutch/src/main/java/com/newspring/dao/PartyDao.java