Added new files for hw2, fixed makeifle to work with my custom one.