made display work on a grid system
added carpeting
Merge branch 'master' of https://github.com/tpoulos/canvas_project
added drag functionality