Adding Types and Items
Testing for competition
Updating Gem Lock
Removing Git lock
Readding Gem Lock
Fixed Merge