removed intellij stuff
Merge branch 'master' of https://github.com/ajefferson/tardis