Fixes merge conflict
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Merge branch 'master' of github.com:JacksonGariety/The-List
Fixed bug with improperly formatted route from the signup commit.