fixing cookies bugs
Merge branch 'master' of github.com:rzhou186/tunetheair

Conflicts:
	public/javascripts/cookies.js
Merge branch 'master' of github.com:rzhou186/tunetheair
Merge branch 'master' of github.com:rzhou186/tunetheair
Updated layout
Merged conflicts