Adding temp license.txt file, to test something out for a tutorial I am writing.
Testing a conflicting change.
Merge branch 'master' of https://github.com/Malkyne/crudly

Conflicts:
	license.txt