Initial add of demo notes_app
Fixing .gitigore merge issue