LICENSE
Merge1

Conflicts:
	LICENSE.txt