commit

ok

Revert "sign"

This reverts commit
ab0c0f829b2f21b4c8cb6dc6df03e357de0e754c.
Revert "Check User or Company"

This reverts commit 76b5e804c86f83a774599abb8b790ff3605bb742.
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/user.js
	routes/sign-in.js