# Conflicts:
#	ChronoPhage_GUI/app/src/main/java/de/hdm/dp/bd/chronophage/model/Task.java
#	ChronoPhage_GUI/app/src/main/java/de/hdm/dp/bd/chronophage/model/db/DbCalls.java
#	ChronoPhage_GUI/app/src/main/java/de/hdm/dp/bd/chronophage/model/db/DbManager.java

Merge branch 'master' of C:\Users\Johannes\Projekte\SoftwareQualityAndTesting\TimeKillerApp with conflicts.

testreports added

added dependencies
ignored failing tests

# Conflicts:
#	ChronoPhage_GUI/app/src/test/java/de/hdm/dp/bd/chronophage/model/TaskTest.java

Merge branch 'master' of C:\Users\Johannes\Projekte\SoftwareQualityAndTesting\TimeKillerApp with conflicts.

Added JUnit, Assertj, Mockito
upgraded Gradle version
made task testable