SCROLLING DOESN'T WORK FIX IT
Merge branch 'master' of github.com:MrCox/wordthings

Conflicts:
	public/js/w.js
	public/js/wordgen.js