first problem
problem num 2 in python
Merge remote-tracking branch 'upstream/master'