Updated JSON format
Updated output
Updated Makefile to reflect new dependencies
Changed file names for helpers
Added a line ending for Thomas
First working version of task 3