added facebook log in to sign up page and fixed gems
commenting css
fixing merge conflicts
fixing merge conflicts
adding styleing to fix css issues
added facebook icon to sign in
fixing merge conflicts
Merge branch 'master' into adding_ajax_to_shops_allong_with_fixing_issues

merging master.