Start Lect7
Correcting Bad Merge Problems Merge branch 'CollegeBranch'