uh
Merge branch 'master' of https://github.com/Trayus/webjam

Conflicts:
	main.js
rectangle
Merge branch 'master' of https://github.com/Trayus/webjam

Conflicts:
	main.js
	rect.js