commiting all the code changes for customer screen
resolved conflicts in 2 files and commiting the code.

todayInfoVC, and ViewController