Authentication, ugly but functional
Merge branch 'master' of github.com:johntrandall/Project2
workin on family edit partials
lots of form bits working - lots left to do
merge conflicts processed