reset hard
Merge branch 'master' of github.com:phillippilares/cribbb