rollback err
Merge branch 'master' of https://github.com/Rinirihiriro/auto_cookie

Conflicts:
	auto_cookie.js
	index.html