new changes
Merge branch 'master' of https://github.com/benallfree/timer

Conflicts:
	Timer/MemoWindow.xib