Midway thru 6
gem lock changes
Merge remote-tracking branch 'origin/modeling-users'
Finish user signup
Add SSL in production
Finish sign in