mine is better w/ flickr
Merge branch 'master' of https://github.com/jgluck/RememberWhen

Conflicts:
	app/src/main/java/com/example/rememberwhen/RememberCameraActivity.java