Added Cookies
Merge branch 'master' of https://github.com/servemoore/pairs

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.scss