SIGN IN SIGN UP

Merge dev

A
Aiden Cline committed
f20709f39235dd5d670605e17e410df2c978f606