Edited some things
Merge branch 'master' of https://github.com/tpoulos/canvas_project