Removed settings menu option after failure
merge conflicts
Merge branch 'master' of https://github.com/ranokmai/wmm