Rudimentary smart box on the landing page
Rudimentary smart box on the landing page
Smarter landing page
Merge remote-tracking branch 'origin/landing' into landing

Conflicts:
	views/index.html
More tidying up from Tims rebase screw up
Play around w/ geolocation.
Change to the wording on the landing page
Merge pull request #6 from betatim/landing

Rudimentary smart box on the landing page
Resolve merge conflict.
Submit button works again
Merge pull request #8 from betatim/button-fix

Repaired the submit button, self merge
New word list based on google ngram from 2008

In addition made handling of word lists in thesethreewords.py
more modular.
Undo temporary filename change

Forgot to undo temporary filename change
Extended landing page with examples

Added some examples to the landing page that will make
it easier for newcomers to understand what this is
and what to do next
Merge pull request #14 from betatim/google-ngram-wordlist

New word list based on google ngram from 2008
Merge pull request #15 from betatim/landing-page-extension

Extended landing page with examples
Merge branch 'upmaster'