More cosmetic change of 'timeslot' to 'start time'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Cosmetic changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/add_log_form.html
Cosmetic changes
Merge remote-tracking branch 'origin/master'