yolo
Merge branch 'master' of https://github.com/halvors/CookieNow

Conflicts:
	site.php