merged with chris
 merged with chris
fixed section 1 and 2
Merged and fixed errors