working on models.py
Merge branch 'master' of github.com:GitSomeCode/Photo-Manip