[commit test]
mm....
Merge branch 'master' of https://github.com/soursop/board.git

Conflicts:
	baro/baro.app.web/src/main/java/com/baro/app/web/config/WebAppInitializer.java
	baro/baro.app.web/src/main/java/com/baro/app/web/config/WebMvcConfig.java
[이건 모 커밋마다 다 해줘야하나?
fd
[왜 충돌났는지 몰라 오버라이드 업데이트 했음]
Merge branch 'master' of https://github.com/soursop/board.git

Conflicts:
	baro/baro.app.web/src/main/java/com/baro/app/web/config/WebConfig.java
	baro/baro.app.web/src/main/java/com/baro/app/web/config/WebMvcConfig.java
	baro/baro.app.web/src/main/java/com/baro/app/web/controller/HelloWorld.java
	baro/baro.app.web/src/main/java/com/baro/app/web/controller/Test.java
	baro/baro.app.web/src/main/resources/struts.properties
	baro/baro.app.web/src/main/resources/struts.xml
	baro/baro.app.web/src/test/java/com/baro/app/web/controller/HelloWorldTest.java
[user view] 추가