Workin'
Merge branch 'master' of https://github.com/paperManu/cookify

Conflicts:
	cookie.js