settings updated
Merge branch 'master' of github.com:dynamicguy/photomatic
login form added
tests added