Added headings.
Merging in changes from James
Cleaning up a2
Merge pull request #46 from depstein/assignment2

@mjskay should take a look now.