clean up ignored files

.gitignore

@@ -1,4 +1,5 @@
 *.orig
+target/
 
 # Compiled class file
 *.class
@@ -59,6 +60,7 @@ $RECYCLE.BIN/
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
+.idea/artifacts/**
 
 # Generated files
 .idea/**/contentModel.xml
@@ -80,11 +82,11 @@ $RECYCLE.BIN/
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+ .idea/modules.xml
+ .idea/*.iml
+ .idea/modules
+ *.iml
+ *.ipr
 
 # CMake
 cmake-build-*/
@@ -202,114 +204,4 @@ Icon
 .AppleDesktop
 Network Trash Folder
 Temporary Items
-.apdisk
-
-### Java template
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-### Windows template
-# Windows thumbnail cache files
-
-# Dump file
-
-# Folder config file
-
-# Recycle Bin used on file shares
-
-# Windows Installer files
-
-# Windows shortcuts
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-
-# Generated files
-
-# Sensitive or high-churn files
-
-# Gradle
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-
-# Mongo Explorer plugin
-
-# File-based project format
-
-# IntelliJ
-
-# mpeltonen/sbt-idea plugin
-
-# JIRA plugin
-
-# Cursive Clojure plugin
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-
-# Editor-based Rest Client
-
-# Android studio 3.1+ serialized cache file
-
-### Eclipse template
-
-# External tool builders
-
-# Locally stored "Eclipse launch configurations"
-
-# PyDev specific (Python IDE for Eclipse)
-
-# CDT-specific (C/C++ Development Tooling)
-
-# CDT- autotools
-
-# Java annotation processor (APT)
-
-# PDT-specific (PHP Development Tools)
-
-# sbteclipse plugin
-
-# Tern plugin
-
-# TeXlipse plugin
-
-# STS (Spring Tool Suite)
-
-# Code Recommenders
-
-# Annotation Processing
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-
-### Java template
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+.apdisk