Facebook login branch started.
facebook login functionality hidden
pretty buttons
updated notes in readme
fixed merge conflicts
Merge branch 'master' into facebook-login

Conflicts:
	readme.md