SIGN IN SIGN UP

Merge branch 'dev' into bash-tweaks

A
Aiden Cline committed
2f5d6ba447b30e725c0efb9a021fe6b0646cdf2b