added todo.log ti .gitignore
.gitignore is now working
merging from upstream

Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from narango/master

todo.py now sorts by priority