First gh-pages commit
Add main page and assets
More vocabulary (nsfw), layout and style tweaks
Updates to vocabulary, styles
Vocab tweaks: cleaning it up a bit
Merge branch 'refs/heads/gh-pages'

Conflicts:
	generator.js
	index.html
	styles.css
	vocab.js
More cleaning up of vocab, updated copy, changed from delimited text to separate strings for vocab entries