Solution 1
+more test and fixes
Solution 1
+more test and fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/demo/Solution1.java
	src/test/java/demo/SolutionTest.java