Styling fixes and algorithm fixes
Fixing changes
Fixing all conflict issues
Merge pull request #10 from joekteo/simondev2

Changes to alg and routes