Inayos si time entries new
Removed unnecessary files
Fixed merge conflicts