modified:   public/javascripts/requier/Confirm.js
	modified:   public/javascripts/requier/drag&drop.js
	modified:   public/javascripts/requier/stepa.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/main.js

	modified:   public/images/static/border-img2.png
	modified:   public/javascripts/main.js
	modified:   public/javascripts/main.js