Merge branch 'master' of github.com:beatsmefm/mongojuice
changed mongoose version
merge conflict