merging dev for now + deleting todo.txt from master