Merge pull request #23 from willietran/layout

Switched back to local server settings
Push to Heroku