Initial commit
first working version from heroku
Merge branch 'master' into gh-pages