added end time label to time_selector if it's not on a 15 minute mark
Merge branch 'master' of https://github.com/vickygx/theFrozzies