pp4 uploaded and makefile updated
"Merge latest 2014.05.19"
pp04 graded 2014.05.21