SIGN IN SIGN UP

Merge pull request #802 from MikeRalphson/patch-2

Remove merge conflict header
D
Darrel committed
19582c979e2b89ec8bf8c738d6643785184b6599
Committed by GitHub <noreply@github.com> on 9/30/2016, 12:54:49 PM