Merge branch 'welcome-home'

templates/speech/welcome_home.yaml

@@ -85,6 +85,14 @@
       {% endif %}
     </p>
 
+    <p>
+      {% if is_state('person.christina_stork','Bob Evans') and is_state('input_boolean.work_today','on') %}
+        <s>Tina is at work right now. She will be done at approximately {{ (state_attr('input_datetime.tina_workday_end','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}</s>
+      {% elif is_state('input_boolean.work_today','on') %}
+        Tina has work today.
+      {% endif %}
+    </p>
+
   {%- endmacro -%}
 
   {# a macro that removes all newline characters, empty spaces, and returns formatted text  #}