<<<<<<< HEAD <<<<<<< HEAD build/ .gradle/ .classpath .project .settings/ bin/ <<<<<<< HEAD ======= .gradle/ build/ >>>>>>> Setup buildsystem ======= build/ .gradle/ .classpath .project .settings/ bin/ >>>>>>> changed Gradle wrapper to version 2.5 ======= .vscode/ >>>>>>> update build.gradle