Programming Assignment2 edited