Merge pull request #37 from JackDougherty/gh-pages

sync northwest w flickr to master
updated file names and testing waypoint
Merge pull request #38 from JackDougherty/master

sync test waypoint to gh-pages