Add comments to the Makefile
Update the config file
Merge branch 'master' of https://github.com/thenickperson/buzzword-generator
Merge branch 'master' into url-attributes
Set the document title in the update function

Conflicts:
	generator.js
Merge branch 'master' into url-attributes

Conflicts:
	generator.js