making sure everything up to date
Merge branch 'master' of https://github.com/lesleyburr/photoform