Merge pull request #1 from AEgan/egan-dev

Egan dev
the server starts and the login page is rendered with /login and I need a commit so here
magic that lets you log in with facebook
Merge branch 'master' into egan-dev
merging that pull request update to this so I can merge again