sprint 1, dag 2
Sprint 1, dag 2
Sprint 1, dag 3
Merge branch 'b1'

Conflicts:
	WorkHours/src/com/example/workhours/MainActivity.java
	WorkHours/src/com/example/workhours/ShiftActivity.java
	WorkHours/src/com/example/workhours/entities/Shift.java