addentry

Conflicts:
	views/loggedin.php
	views/loginscreen.php
gitignore