updating deploy to digital ocean
change layout on forum to be like main app
updated articles
merge conflict