Fixed shit
Merge branch 'master' of https://github.com/katexyu/FlickrTrendr
stuff
Merge branch 'master' of https://github.com/katexyu/FlickrTrendr
STUFF
Merge branch 'master' of https://github.com/katexyu/FlickrTrendr
Things be working