fix
Merge branch 'master' of https://github.com/JohnSimonCo/NotesApp

Conflicts:
	AnotherApp/bin/classes/com/example/anotherapp/Resource.class