Alyssa's edits.
Merge branch 'master' of https://github.com/jaguirre/STARFIRE