Updated things
Merge branch 'master' of https://github.com/kristenmills/kristenmills.github.com