commit for pull request
Merge remote-tracking branch 'origin/master'

Conflicts:
	ToDoList
Merge pull request #9 from Aurilux/master

Minimal working version