Added second file.
Misceallaneaous
Merge branch 'testing'
Modified first file.
Modified first file.
Merge master and conflict.
Modified first file again.
Modified first file again.
Merge branch 'conflict'

Conflicts:
	first_file.txt