removed email requirement
facebook changing everything fixed
Merge branch 'master' into markdown
got javascript to work (ugly)