Final commit
Merge branch 'master' of github.com:aluong91/bidit-backend