Login and Register v1

will be adding stuff later
fix conflicts