Merge pull request #53 from Street-Meet/staging

Staging
fixed what static file the server is serving
Merge pull request #59 from TonOfPrince/static

Static