merge conflict
merge conflict resolved
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle into css-round-2
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle into css-round-2
dealing with merge issues
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Fixed style merge issues

* added new sass variable names in place of old ones
Fixed controller merge issues

* added missing parentheses in main_controller
* added missing end in application_controller
Merge pull request #53 from keaty/master

Fixed style and controller merge issues
Made final refinements to the NYTimes search

* finalized query formatting and content for the Times API in the app/services/nytimes_messenger.rb file
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle into css-round-2
Merge pull request #54 from tyleraadams/bug/nyt_search

Bug/nyt search
styled intro and nav bar, added logo
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
centered logo and name
added margin and padding, put background color in top div
Merge pull request #7 from juliahimmel/css-implementation

Css implementation
Merge pull request #55 from juliahimmel/master

Css implementation
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
fixed extra end in application controller due to merging