modifico gitgore
Merge branch 'master' of https://github.com/jvelez76/nekky-dev

Conflicts:
	.idea/workspace.xml