added new line
not another change...
ted
created a contract
removed legal 2
added new legal 2
added not so legal 3
article added
Merge branch 'legal01' into testing resolved

Conflicts:
	contract.txt
Merge branch 'notlegal' into testing

Conflicts:
	contract.txt
	main.c
removed 'te'
altceva
no
deleted some files
Merge branch 'newbranch'

Conflicts:
	LICENSE
Merge branch 'testing'

Conflicts:
	contract.txt
'deleted'