ignoring intellij
updated dependencies
large refactoring
merge
removing old stuff