Merge branch 'master' of https://github.com/icecoldmilk001/helloWorld

Conflicts:
	src/main/java/foo/App.java
	src/main/java/spring/beanFactory/HelloWorld.java
a