Updated Assignment 1

Closed second while loop at proper location