tweaked file
commited part of a file
changed licence
from the stash thing
bug fixed
trying to make a conflict
Merge branch 'bugs'

Conflicts:
	bug.txt