finishing programming assignment 2 v1-09-16-14
Merge remote-tracking branch 'upstream/master'