Updated Project 1 & 2

Combined all the projects