got a commit yall
Merge pull request #5 from nicdev/davincis

got a commit yall
I fixed the conflict.