changes to p1.
Merge branch 'fix_p1' of https://github.com/scchapma/C370A4
Change to p6.
Merge branch 'fix_p1' of https://github.com/scchapma/C370A4
Change p6