lblb
Merge branch 'master' of github.com:revan-kun/git_tut
changed fix.txt
fixed fix.txt
Merge branch 'bug-fix'

Conflicts:
	fix.txt
Removes messy in README