Cleanup
Merge branch 'master' of https://github.com/Timothep/SmartFlickrSniffer

Conflicts:
	README.md