add tag styling
Merge branch 'master' into tag-css
wrap js in pageloads to work with turbolinks
only show top 20 questions on load, and when not searching
Add buttons styles
.
Merge branch 'master' into taryn_styling
Merge pull request #48 from tarynsauer/taryn_styling

Taryn styling
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
Merge branch 'master' into turbolink-js-fix

Conflicts:
	app/assets/stylesheets/basic_styling.css
Merge pull request #46 from tarynsauer/turbolink-js-fix

Turbolink js fix
Resolve merge conflicts