Merge branch 'master' of https://github.com/FnuJava/spring-boot.git

Conflicts:
	src/main/java/com/example/Application.java

Author: SamSandoz

src/main/java/com/example/Application.java

@@ -10,7 +10,7 @@ public class Application {
 
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
-		int a11=2;
+		int a121=2;
 		System.out.println(1);
 	}