Merge pull request #30 from gcborders/master

Pull Master to Crystal
Content update, take 2

All content that we have as of 4/16 implemented.
Merge pull request #31 from gcborders/Crystal

Crystals content
Merge pull request #33 from gcborders/master

Pull in Master