Merge remote-tracking branch 'origin/William'
Merge branch 'master' of https://github.com/jessetipton/ImageManipulation