Programming Assignment 2 | commit on 6/16/14 v2