Adding adjectives starting with 'd' second
Merge branch 'master' of https://github.com/chrisinaber/test1
Conflicts:
	file2.txt
Resolved by taking lines from both