Commit before merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Commit before merge
commit for pull request
Delete ToDoList
Merge pull request #7 from Aurilux/master

Post-modjam