Adding the cookie plugin
Merge branch 'master' of github.com:xmaeztu/xmaeztu.github.com

Conflicts:
	js/main.js