Fix server.rb syntax
Merge Conflicts
Views and JS conflicts
Views
Delete old index html
Merge pull request #3 from CodeForKids/views-js

Views js