Resolving pull conflicts
fixed index.html
Merge branch 'master' of https://github.com/nanap/malaria