Rename functions
Merge branch 'master' of github.com:stevengoldberg/stevengoldberg.github.com