1 dets
conflict resolve
Merge branch 'master' of https://github.com/itstep2013autumnEvening/Justforfun