media and canvas
Merge branch 'master' of github.com:fdogarro/hangman