comment
merge conflict already?
merge
:wq
Merge branch 'master' of https://github.com/lauyeung/weQuery
merge
votes happy path
state_machine
Merge branch 'master' of https://github.com/lauyeung/weQuery
state-machine/merges
Merge pull request #9 from lauyeung/state_machine

State machine