upload assignment4
Merge http://github.com/mz948/assignment4