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

Conflicts:
	.idea/workspace.xml
	js/controllers/editorController.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/Boram-Jeong/CareerBox
Merge branch 'master' of https://github.com/Boram-Jeong/CareerBox
Merge branch 'master' of https://github.com/Boram-Jeong/CareerBox
main.js commit