cleaned uo routes
i lied, not they clean
now*
fixed conflix
Merge pull request #28 from seanbr/dojoing

Dojoing