uncommented debugger from Gemfile
added image, made it the background
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
styled intro dic, search box
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer into css
Styled title and intro div. Styled search box. Need to put shadow inside search box.
Merge pull request #3 from juliahimmel/css

Css
Merge pull request #16 from juliahimmel/master

CSS additions
Merge pull request #17 from onweapps/master

Added certification searches along with NYT results in JSON format. resc...
Set up Browse controller and view files
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	public/templates/mainIndex.html
Moved Freebase Ajax call into AngularJS IndexCtrl
Merge pull request #18 from keaty/master

Integrating Ajax with AngularJS
Connected Freebase response data to AngularJS views

* adjusted $http call to set variables accessible to the angularJS view
* added conditional displays to view
Merge pull request #20 from keaty/master

Connected Freebase response data to AngularJS views
View and stylesheet updates

* adjusted percentage widths of content containers
* removed png background
* added ng-show divs to reveal content only when available
* added ng-repeat to nyt responses
Update README.md
Merge pull request #21 from keaty/master

View and stylesheet updates
Delete .DS_Store
Delete Gemfile.lock