13:50分更新
13:53更新
マージ用にコンフリクト解消
Merge remote-tracking branch 'origin/minemine' into bako2

Conflicts:
	MoneyWeb/WebContent/META-INF/context.xml
	MoneyWeb/WebContent/WEB-INF/web.xml
	MoneyWeb/WebContent/search.jsp
	MoneyWeb/src/MoneyWeb/web/CreateServlet.java
	MoneyWeb/src/MoneyWeb/web/ListServlet.java
	MoneyWeb/src/MoneyWeb/web/RegistarServlet.java
15:41更新　こば
Merge remote-tracking branch 'origin/bako2' into hamakyo00

Conflicts:
	MoneyWeb/WebContent/META-INF/context.xml
	MoneyWeb/src/MoneyWeb/dao/MoneyWebDAO.java
	MoneyWeb/src/MoneyWeb/web/EditServlet.java
サーブレットの修正、jspのデザイン修正、jsp増やした