Started working on encoding and decoding url strings
Merge branch 'master' of https://github.com/StephenNu/hairy-octo-lana-server
Eirc had already updated some code.