Add comments to the Makefile
Update the config file
Merge branch 'master' of https://github.com/thenickperson/buzzword-generator
Support overriding the displayed text with the "text" URL parameter
Fix a bug where clicking the button would not properly generate new text
Replace the URL with the current generated text
Don't redefine the text variable
Set the document title in the update function
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
Merge pull request #3 from thenickperson/url-attributes

Generate a unique URL for each quote
Merge branch 'master' into twitter