First commit
Initial commit
Merge branch 'master' of https://github.com/rnlambert7/canvas
added heroku buildpack
Merged conflicts