Fixed fix.txt
Add new todo
Update README
Changed fix.txt
Changed fix.txt
Merge branch 'bug-fix'

Conflicts:
	fix.txt