commit add notes, take picture
Merge branch 'master' of https://github.com/b4um1/Microproject_Notes.git

Conflicts:
	Microproject_Nots/AndroidManifest.xml
	Microproject_Nots/bin/AndroidManifest.xml
	Microproject_Nots/res/values/strings.xml