Updated lock after merge with upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated Digital Ocean Referral Code
Merge pull request #6 from KayoticSully/master

Updated Referral Code for Digital Ocean
update database configuration and documentation
bug fixes in tests?