init
login added
registration added
Merge remote-tracking branch 'origin/master'