Merge branch 'master' of https://github.com/Boram-Jeong/CareerBox

Conflicts:
	.idea/workspace.xml
	js/controllers/editorController.js