Updating .gitignore for intellij and java
Merge branch 'master' of github.com:forkmantis/event-tracker-app