muudatused
asd
süntaks error
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus

Conflicts:
	Build/_bootstrap-2.3.2/docs/assets/css/bootstrap.css
	Build/_bootstrap-2.3.2/docs/assets/css/docs.css
	Build/css/advokatuur.css
	Build/css/style.css
	Build/examinant-register.html
	Build/examinant-test.html
	Build/index.html
	Build/js/advokatuur-angular-rules.js
	Build/js/advokatuur-jquery-plugins.js
	Build/less/advokatuur.less
	Build/less/bootstrap-less/bootstrap.css
	Build/less/style.less
	Build/register.html
	_includes/_footer.html
	_includes/_head.html
	js/advokatuur-jquery-plugins.js
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus

Conflicts:
	_includes/_administrator/_exam_answeres.html
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus