Fixed bugs in server, *should* be working.
Merge branch 'master' of https://github.com/rbellido/fuzzy-hipster