fixed routing
changed routes
fixed request bug
Merge pull request #102 from SamLau95/bugs

Bugs