Merge branch 'gh-pages' of github.com:ymatuhin/triangulation

Conflicts:
	.idea/workspace.xml
	js/app.js
Merge branch 'master' of github.com:ymatuhin/triangulation

Conflicts:
	js/app.js