removed merge conflict things
Merge pull request #1 from thomasballinger/master

removed merge conflict things