almost final project files
fixed merge conflicts