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

Conflicts:
	index.html