what am i doing
Merge branch 'master' of github.com:dannyfreeman/magPhoto