Google doc registration added
Merge branch 'master' of github.com:hack-rice/hack-rice.github.com
Recompiled from merge conflicts