My changes plus conflict. DayTime scene messages added.
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013