Merged DJ's files with Charbel's files and created a unified project.