edit option pane added, functionality to be added later
Merge branch 'master' of https://github.com/sojj/wushumushu