forgotten commit
recommit
Merge branch 'master' of https://github.com/LoneHouse/oDeskTimer

Conflicts:
	oDeskTimer/AppDelegate/AppDelegate.m