fixes routes
resolved the stupidest merge conflict
checking diffs on github
resolves merge conflicts
Merge pull request #14 from Elffers/bugfix

Bugfix