Working on locations more
Merge branch 'master' of github.com:jgluck/RememberWhen

Conflicts:
	app/src/main/java/com/example/rememberwhen/RememberPhotoBundle.java
	app/src/main/java/com/example/rememberwhen/flickr.java
Merge branch 'master' of github.com:jgluck/RememberWhen
Reverting changes
reverting more changes