Sign in button
Fix merge conflict
Sign in repairs
Merge branch 'master' of github.com:sihrc/Story-Quilt