21:12 in master
21:23 master
07:26 devel
07:28 devel
07:48 master
07:49 master
07:51 master
08:58 developer
chapter 35 in developer
21:44 in developer
21:54 in master
21:57 in developer
Merge branch 'master' into developer

Conflicts:
	app/src/main/java/com/example/runtracker/DataLoader.java
08:24 in developer
08:25 in developer
08:30 in developer
08:46 in developer
09:02 in developer
chapter 36