add gitignore
Merge commit '4d0f633df7cc047187f980ab84d04151f918cb21'

Conflicts:
	.idea/workspace.xml