Bad bug has been fixed
Note to stop bad bugs
Merge branch 'bugFix'

Conflicts:
	bug.txt
fixed the feckin bug!