Add Digital Ocean
fix merge conflict
Merge branch 'LkeMitchll-master'