Added bootstrap and got time entries for the past week printing out
Fixed conflicts