Merge pull request #1 from saaaaaaki/develop

test
すてき！！！！！！
リネームしました
つーじーたくや
aaa
Merge pull request #3 from saaaaaaki/TsujiTakuya

つーじーたくや
no message
Merge commit '330e35f6734ca790c93d5cca57125e6428a1a8ff' into develop

Conflicts:
	src/main/webapp/WEB-INF/views/sample.jsp
	src/main/webapp/WEB-INF/views/yaruo.jsp
	src/main/webapp/WEB-INF/views/yaruo.jsp~origin_yaruo
	target/m2e-wtp/web-resources/META-INF/maven/jp.co/group/pom.properties
change files
change test.txt
Merge branch 'develop' of https://github.com/saaaaaaki/groupTest2 into develop

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/jp.co/group/pom.properties
Merge branch 'master' of https://github.com/saaaaaaki/groupTest2 into develop
pull iwasaki
Merge branch 'RyoIwasaki' into develop
change pom
Update .gitignore

gitifnoreにpom.propertiesとMANIFEST.MFを追加しました。
no message
Delete MANIFEST.MF

delete
Delete pom.properties
masudacontroller