original author commit again
Successful merge

Merge branch 'master' of https://github.com/branaugj/conflict_test

Conflicts:
	file