Update templates, moved js to static
Commit canvaspg.html & layout.html
Edit templates
Merge branch 'canvas' into frontend
Add new thingys
Fixed merge conflicts