Update controller.rb
Update controller.rb
Merge branch 'dinodex_feature' of https://github.com/jillalynch/level_up_exercises into dinodex_feature

Conflicts:
	dino_catalog/controller.rb