a few more updates to timer app
Merge branch 'master' of https://github.com/benallfree/timer

Conflicts:
Timer/MemoWindow.xib
Merge branch 'master' of https://github.com/benallfree/timer