removed ide specifics
Merge branch 'testing'

Conflicts:
	.idea/workspace.xml