Readd files which weren't needed for ICFP
Fix Git whitespace error

Remove extra newline at file end (a file should end with one newline
character, no more, no less).