Add facebook sign-up
Create user-wish association
Merge branch 'master' of github.com:danielfriis/wishlist

Conflicts:
	config/app_environment_variables.rb