added user id and cookie stuff
Merge branch 'master' of https://github.com/sarahddubs/sassy
Merge branch 'master' of https://github.com/sarahddubs/sassy