index.html can now locally, node.js currently only functions a s proxy for CORS (ical to another server)

http://localhost:8888 still works with that configuration
Merge remote-tracking branch 'origin/master' into angular.js