Added .gitignore, merged NoteActivity, bumped version