ignore .idea/*
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
New graphing option
Merge remote-tracking branch 'origin/master'