added static files manually
Merge branch 'setup'