only show top 20 questions on load, and when not searching
Merge branch 'master' into questions

Conflicts:
	app/views/welcome/index.html.erb
Merge pull request #47 from tarynsauer/questions

only show top 20 questions on load, and when not searching