udpate to week 5 pip2
addition for week 5 pip2, BuildingAProgram
resolve merge conflict in toc.rst for pip2
release version of ps5 for pip2