Fixed assignment2_main

Just going to merge this as it just changed the main file to conform to the source files.