Ignore IntelliJ files
call sc.stop
Merge branch 'local-master'