Green

Now that I am a collaborator this should work
Merge branch 'Dev-Build' of https://github.com/sammovale/Time into Dev-Build

Conflicts:
	Time/ViewController.m