Ignore IntelliJ
Merge remote-tracking branch 'origin/master' into finite-state-machine

Conflicts:
	.gitignore
State Machine