my django app
add my notesapp
now show all notes, not only last five; Project works on heroku
merge confilts resolved