[MainScreen] Details
Merge branch 'master' of https://github.com/TimePie/TimePie

Conflicts:
	TimePie/TimePie/MainScreenViewController.m