Merge pull request #1 from alexung/alex_css_header

Alex css header
Merge pull request #2 from alexung/alex_login

Alex login
working toward christmas card
Everything but the image
all is well with the world
Update README
Edit readme
test commit
Fix merge conflicts