made settings.py settings secret by adding to enviroment variables in the virtualenv
Creates Articles app with models
fixed merge