Initial commit for project3
merging master