Remove files that cause conflicts
Merge pull request #1 from GiggleKatDevs/master

Remove files that cause conflicts