no cookie
Merge branch 'master' of gh:creatdenoi/homefile

Conflicts:
	app/index.html