SIGN IN SIGN UP

Merge remote-tracking branch 'origin/master' into tyriar/electron-1.7.3

D
Daniel Imms committed
0aa551ce45664e0fbdd054c8f2b7e2348748bdfa