fixed run
Merge branch 'master' of github.com:ludwiksh/Marksimos

Conflicts:
	api/controllers/init.js
	public/app/js/model.js