3_files
Merge branch 'master' of https://github.com/yoolkTrainee/yoolk_school_app

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'master' of https://github.com/yoolkTrainee/yoolk_school_app
edit_cateogry_spec