setting up for heroku deployment
Merge branch 'master' into paulbranch
Merge pull request #27 from mplaza/paulbranch

Paulbranch