Implemented MainActivity and End PhotoSession Activity. Base links are working
Merge branch 'master' of github.com:congchen5/photofocus

Conflicts:
	app/AndroidManifest.xml
	app/bin/AndroidManifest.xml
	app/bin/PhotoFocus.apk
	app/bin/R.txt
	app/bin/classes.dex
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/MainActivity.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/MapPhotoActivity$1.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/MapPhotoActivity.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/PhotoSession$1.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/PhotoSession.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$attr.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$dimen.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$drawable.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$id.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$layout.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$menu.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$string.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$style.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R.class
	app/bin/resources.ap_
	app/gen/edu/berkeley/cs160/stackunderflow/photofocus/R.java
	app/res/values/strings.xml
	app/src/edu/berkeley/cs160/stackunderflow/photofocus/MapPhotoActivity.java