testing on heroku
Merge branch 'master' of https://github.com/semateos/stimpy-mobile
testing
added cors config to server to allow cross site requests