application.yml.sample file
Merge branch 'master' of github.com:kstag07/Refactor-Site into omniauth
before fixing merge conflicts
Pulldown for Language operational
test_helper sign_in uses users fixture instead of role
moved author test to author folder
fixed merge conflicts
language test dev
Merge pull request #44 from kstag07/kevin

making all tests pass and putting search box in navbar as well as adding...
resolved merge conflicts
Merge pull request #45 from kstag07/language

Language feature
doin it
changed merged file
fixing searching posts
added search feature for language