workspace change?
Merge branch 'master' of https://github.com/javier-lerones-gallego/Campfire

Conflicts:
	.idea/workspace.xml