serve /index.html
resolving conflict
Merge branch 'piranha-master'