editing self-description
Merge branch 'master' of https://github.com/GrayAreaorg/Fall-Immersive-2014