let's commit
Initial Commit to Abe'sBranch
Added Camera
Button placement, added ReviewSubmissionsActivity
Merge remote-tracking branch 'origin/Abe'sBranch' into Abe'sBranch

Conflicts:
	SDAP1/src/com/selfDesign/sdap1/ChooseAnOptionActivity.java
Commit with camera Activity implemented, but not functional, Note
Activity implemented by also not functional.
Snapshot 1.a
Merge branch 'UberMaster' of
https://github.com/Cletus-Doy-Shinda/SDAP1.git into UberMaster

Conflicts:
	SDAP1/gen/com/selfDesign/sdap1/R.java
	SDAP1/res/layout/activity_camera.xml
	SDAP1/res/layout/activity_note.xml
	SDAP1/src/com/selfDesign/sdap1/ChooseAnOptionActivity.java
	SDAP1/src/com/selfDesign/sdap1/MainMenuActivity.java
	SDAP1/src/com/selfDesign/sdap1/MakePhotoActivity.java
	SDAP1/src/com/selfDesign/sdap1/NoteActivity.java
	SDAP1/src/com/selfDesign/sdap1/SplashScreen.java