reset HEAD>
Merge branch 'master' of github.com:cinease/jofy
1