Merge branch 'bug-fix'
fixed master bug
Merge branch 'bug-fix'

Conflicts:
	bugfix.txt
on master from bug
modify master bug
yee
scratch
again