sprint 1 first commit
merge
merge1
merge2
gitignore
ignore
merge
deal 005
DEAL-001 done and DEAL-006: fb login not working
shares
diferentes markers
Merge branch 'DEAL-003' of https://github.com/lauralb/dealhunter into DEAL-003
El retorno del server
Estamos viendo para que con tomi y lucas no haya problemas
Merge branch 'DEAL-003' of https://github.com/lauralb/dealhunter into DEAL-003
DEAL-006. FB login. FB share.
Merge remote-tracking branch 'origin/DEAL-003'

Conflicts:
	.idea/.generators
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dealhunter.iml
	.idea/misc.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/DEAL-005'

Conflicts:
	.gitignore~
	.idea/.generators
	.idea/.rakeTasks
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dealhunter.iml
	.idea/misc.xml
	.idea/workspace.xml
	app/models/offer.rb
	db/schema.rb
Merge remote-tracking branch 'origin/DEAL-006'

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dealhunter.iml
	.idea/misc.xml
	.idea/runConfigurations/Development__dealhunter.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	db/schema.rb
Merge remote-tracking branch 'origin/DEAL-007'

Conflicts:
	app/controllers/users_controller.rb
	app/views/offers/show.html.erb
	app/views/users/home_view.erb