Pulling my dev build into master

I'll have to delete all my intellij stuff from master