add python exercise scripts, Aug-13, 2014
resolve the conflicts