updated Project 2
Removed metadata folder.
Resolved merge conflicts.