undoing one action works
Merge branch 'master' of github.com:zhangela/git-undo

Conflicts:
	wrapper.py