fixing merge on index.html
Merge branch 'master' of https://github.com/liouh/planner
Merge pull request #31 from liouh/master

fixing merge issue on index.html