resolving css merge conflicts
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Styling to landing screen

* made #landing 100% height and width
* centered #landing-content
* added transition effect to both post-search
* added pulse effect on logo during load of search results
resolving merge conflict in application.html.erb layout file
Merge pull request #72 from keaty/master

Styling to landing screen
fixing merge conflicts