Quite a bit of work on quite a bit of things. IntelliJ also decided to fix spacing.
Merge pull request #4 from ArtificialCraft/ArtificialBranch

Quite a bit of work on quite a bit of things. IntelliJ also decided to f...