added a test in main function
resolved merge conflict
fixed all of jackie's bugs