Pulled out User Cookies
Merge branch 'master' of https://github.com/AFenhoff/Greeter

Conflicts:
	.gitignore