Added most of p6
Merge branch 'master' of github.com:Stuycs-K/APCS-20142015