Added name to list of contributors
Added name to list of contributors
Merged contributors
Removed conflict data from source
Merge pull request #57 from madebykite/develop

Added name to list of contributors