-
Merge branch 'erik' of github.com:erikdejonge/sort_photo into erik