adding working version of project2
adding project3
merging changes