updated .gitignore
Merge branch 'master' of github.com:kandluis/crimsonstore
moved import of local_settings lower down in settings.py, updated Photo model
Merge branch 'master' of github.com:kandluis/crimsonstore
merge conflict
Fixed merged conflict