Routes branch merge

successfully build the pages of this challenge, almost