fix
fix 2
updated palette template
Merge branch 'templates' into dev
updated canvas size
Merge branch 'canvas' into dev
d
fixed canvas size
fix conflict
added thief library