adding majkor button
Merge branch 'master' of https://github.com/liouh/planner