solved Bug 1033630
changed identation and fixed the code
fixed identations
fixed merge issue
fixed the html file
Merge pull request #76 from anurag619/master

solved Bug 1033630