change conflict.txt
Took Tyler's version of conflict.txt
Merge branch 'master' of https://github.com/csperlich/test

Conflicts:
	conflict.txt