d
Merge branch 'master' of https://github.com/btpka3/btpka3.github.com

Conflicts:
	java/spring/mvc/first-spring-rs/pom.xml