Fixed times and reporting, added welcome message
fix conglict
fixed conflicts agian