added some of Evan's login files
Merge branch 'master' into login
add registration and everything