first commit
added fb login
big changes
Merge branch 'master' of https://github.com/khamoud/spreeify

Conflicts:
	Gemfile
fixed