Changed puck colour back, added id attribute to canvas
Merge branch 'dev' of https://github.com/team3b/Puckt into dev

Conflicts:
	src/js/obj/Puck.js