Not needed
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.name