static files
fixed merge confilcts
Merge pull request #5 from rgschneider/robert-feature

static files