added starter code
fixed conflicts
added article and playlist models