fix reg branch conflicts
form changes
Merge pull request #2 from sb8244/steve

form changes
login form
Merge pull request #3 from sb8244/steve

login form
unfuck