tweaked fix.txt
updated header on README.markdown
fixed fix.txt
add one line todo
added extra line to TODO
added change to README
updated README
added terrible
made this fix important
Merge branch 'bug-fix'

Conflicts:
	fix.txt