Digitalocean

Updating master with most recent branch. This is the branch that is running on VPS and used in the presentation.