Req 10
Req 1
Req 2
Req 4
Req 5
Req 6
Req 8
Update app/views/timelog/_date_range.html.erb

Minor Fix
Fix conflicts