merged
currently cannot upload the files to webhost.haskell.org, since the ftp server throws me an error... will try again tomorrow
