Fixed up merge conflict in index.html
Merge pull request #3 from codingchik/signup

Fixed up merge conflict in index.html