fixed bugs and rebuild backend
Merge branch 'master' of https://github.com/luukgruijs/project6