Merge branch 'master' into dev
added todo file
Update todo.md

Fixed wording & UTF-8 formatting
Merge pull request #17 from flymke/dev

Dev