started cookie stuff
Merge branch 'master' of https://github.com/cowboysfn007/SER-421-Lab-3

blah
cookie stuff done
fixed merge issue?