initial upload
Merge branch 'master' of https://github.com/audibleblink/flickr_jr

Conflicts:
	.gitignore
upload