Initial import
Merge branch 'master' of github.com:edderrd/FlickrWall

Conflicts:
	README.md