hge
hge
Merge branch 'easytrip' of https://github.com/Zuohr/flweekr into
easytrip

Conflicts:
	flweekr/src/pentagon/flickrbean/Photo.java