fixing merge on index.html
Merge branch 'master' of https://github.com/liouh/planner