basic template and login/register
Merge remote-tracking branch 'origin/master'