completed assignment 2

final version for submission