added p6 to scala
Merge branch 'scala'