removed the patriarchy
Merge branch 'master' of http://github.com/yasuin/hack101website

wtf happened??