ryerbanta/LIT-Canvas-Files — pull request #3 by ryerbanta (2014-12-09 19:09:16+00:00)
Title: 12 9 version

merge 12-9 branch into master