iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/RockPy.iml
Merge remote-tracking branch 'origin/master'
dict comprehension written in rockpydata for Python >= 2.7