Delete nohup.out
Login Register Forgot password.
Gitignore changes.
Merge branch 'master' of https://github.com/jfaluvegi/delta

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge branch 'merger'
Resolved pull request problems.
Deleted User~.
Merge pull request #2 from jfaluvegi/master

Login,register,forgot password,user activation