Fixed bad merge
Fixed bad merge

Tiglas/ContributingToOpenSource,dlangille/ContributingToOpenSource,dlangille/ContributingToOpenSource,Tiglas/ContributingToOpenSource,dlangille/ContributingToOpenSource,Tiglas/ContributingToOpenSource