Exit Alert
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/android/notepad/NoteEditor.java