Added Neil's edits.
Updated Makefile
Merge branch 'neil_edits' of github.com:JRoTheGeek/CS3013