Few changes; commiting just to create a new branch.
merge conflicts in app.js and professor.js was solved.