john's data
Merge branch 'master' of https://github.com/RyanFrost/RiftResearch
John's data ready to go