Added challenge page
Merged Conflict on Routes.rb