update README
update README
Merge branch 'master' of github.com:lafave/quiz

Conflicts:
	README.md