Added things to create conflict
Merge branch 'kyle'

Conflicts:
	conflict.txt
added master change 3
Added my conflict
added a conflicting change
Fixed conflict in branch 'caleb' and merged

Conflicts:
	conflict.txt