Made localhost work
Merge pull request #1 from granttimmerman/master

Made localhost work