added mouseover color for button
fixed another semicolon
Deleted .DS_Store file
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Fixed unicode issue with NTY search
- now subbing out all non unicode
- chomping "the " and " company" for better query results
- added a news boolean to json object if NYT results are present to assist front end processing
Update README.md
Added Jasmine to the asset pipiline

* added Jasmine-Rails to gemfile
* installed jasmine.yml file
* moved some angular resources from assets to app/javascripts/vendor
* moved entire asset pipeliine manifest into application.js
* added angular-mocks into spec/javascripts/helpers
* added Jasmine tests to spec/javascripts/mainIndexCtrl_spec.js
fixed formatting query bug, no longer using destructive methods
merge
Merge pull request #73 from onweapps/master

Refactored NYT search
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle into chore/jasmine

Conflicts:
	app/assets/stylesheets/main.scss
	app/controllers/application_controller.rb
	app/services/nytimes_messenger.rb
Merge pull request #70 from tyleraadams/chore/jasmine

Added Jasmine to the asset pipiline
Update main.scss
refactored controller tests to reflect new design
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer