1
conflict resolve
Merge branch 'master' of https://github.com/itstep2014springDay/JustForFun