I'm trying to get rid of syncing workspace.xml
Merge branch 'master' of https://github.com/rodrigodub/Snoopy

Conflicts:
	.idea/workspace.xml