Assignment7
Merge http://github.com/dhuynh827/CS594