added some stuff
change git ignore
blah
Merge branch 'add-login-registration'

it is very necessary