more
Merge remote-tracking branch 'upstream/master'
cookie login
Merge pull request #10 from patriot1burke/master

more