setup test specs and environmental variables
user, journey, topic models
user searches feature test
Merge pull request #2 from shawnbro/userSearch

user searches feature test
Merge pull request #1 from rory2988/models

user, journey, topic models
database
Merge branch 'master' of https://github.com/shawnbro/quick_shark
routes setup
rewind
fixed merge conflicts
Merge branch 'master' of https://github.com/shawnbro/quick_shark
merged with master
user searches, it creates a topic, and shows the topic page
search query lists results on topic show page
Merge pull request #4 from shawnbro/userSearch

User search
Merge branch 'master' of https://github.com/shawnbro/quick_shark
corrected wordnik variable name
fixed api key for wordnik
user create account and log in and out
fixed routes merge error