moved index html up a level
merged changes to bower install dir
frontend code to talk to server
merge