Carlos data
Merge branch 'master' of https://github.com/RyanFrost/RiftResearch