nginx and unicorn
move database to digital ocean
fix conflict