Added a photo stream
Merge branch 'master' of https://github.com/WarrenGreen/petulant-hipster

Conflicts:
	bin/classes.dex
	bin/classes/com/MHacks/petulant_hipster/MainActivity.class
	bin/classes/com/example/petulant_hipster/R$id.class
	bin/classes/com/example/petulant_hipster/R$layout.class
	bin/classes/com/example/petulant_hipster/R$menu.class
	bin/classes/com/example/petulant_hipster/R$string.class
	bin/classes/com/example/petulant_hipster/R$style.class
	bin/petulant-hipster.apk
	bin/resources.ap_
	gen/com/example/petulant_hipster/R.java
	res/layout/list_row.xml
Added Photo Stream