git flow, git undo, git branch
Merge pull request #5 from jrmichael/gh-pages

git flow, git undo, git branch