fixed conflict
Merge pull request #46 from RTakes/master

fixed conflict