oops
add three files
commit on test
change second and third
capitalize text!
 alter license
Merge branch 'test'

Conflicts:
	second.txt
	third.txt