sdsadasd
updated header on README
added header to TODO
change TODO
fixed fix.txt
stahed stuff
change README
updated README
changed this to that
made this fix important.
Merge branch 'bug-fix'

Conflicts:
	fix.txt