Hour parsing, UI updates
branch switching
branch switching 2
merge test
Merge branch 'master' into willgu29-master
"test merge"
fixed merge error