config
Merge branch 'master' of
https://github.com/jessehwong/DesignatedDriving.git

Conflicts:
	WebContent/WEB-INF/applicationContext.xml
	src/main/java/dbconn.properties