updated gitignore
solved conflict

Conflicts:
	.idea/workspace.xml