static files not loading locally
Merge remote-tracking branch 'origin/master'