Added switch, nav controllers, timer picker
you can't tell me how to live
I hate you
Merge remote-tracking branch 'origin/master'