message
Merge branch 'master' of https://github.com/lihongjing/TrainingBudget

Conflicts:
	.idea/workspace.xml
	out/production/trainingbudget/com/thoughtworks/tb/MainServlet.class
	src/main/java/com/thoughtworks/tb/MainServlet.java