Merge branch 'master' of https://github.com/prop2014/java
Merge branch 'master' of https://github.com/prop2014/java
Merge branch 'master' of https://github.com/prop2014/java
sols