- Graph works now after merging.
- Still need to do dynamic graph
Make commits before merges
Add web.xml file to allow merge
Merge branch 'deep_dont_touch'

Conflicts:
	Code/HealthyEatingApp/.classpath
	Code/HealthyEatingApp/.gwt/.gwt-log
	Code/HealthyEatingApp/src/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp.java
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp$1.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/Homepage.class
Merge remote-tracking branch 'origin' into Kevin

Conflicts:
	Code/HealthyEatingApp/src/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp.java
	Code/HealthyEatingApp/src/com/google/gwt/sample/healthyeatingapp/client/Homepage.java
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/DBConnectionService.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/DBConnectionServiceAsync.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp$LoginButtonCallback.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/HealthyEatingApp.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/Homepage.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/SocialMedia$DefaultCallback.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/client/SocialMedia.class
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/server/DBConnectionServiceImpl.class