second canvas added
Merge branch 'master' of https://github.com/seanmacdonaill/ggj14