add joints
Merge branch 'master' of https://github.com/artemzalescky/kursach

Conflicts:
	js/events.js
	js/main.js
	js/objects.js