commit merge
merge changes
finished weather and day of week enhancements
merges