now serving client side file statically
Merge remote-tracking branch 'origin/master'