prepare for segue
Merge remote-tracking branch 'origin/local3' into local3
pass string to clocksetup
Merge remote-tracking branch 'origin/local3' into shawna2
switched the thing
pull codeMerge branch 'local3' of https://github.com/Lefty-San/WorldClock into shawna2
idk