Fix for documentation about proxy settings
Merge branch 'master' into proxy-doc-update
Making the document easier to understand for proxying. Updated the options to be proxyUrl, as well as updating that value in serve.js
Update README.md
Merge pull request #148 from driftyco/proxy-doc-update

Fix for documentation about proxy settings