updated makefile for amos and cleaned up assn3.c