Fixed assignment2_main
Merge pull request #9 from bsoetaer/final_cleanup

Fixed assignment2_main Merged #9