Added intellij files making it easier to build for someone else.
Merge remote-tracking branch 'origin/master'