Initial commit
Fix Procfile
Minor fix on index.html
Fix conflicts